Skip to content

ci-config: add tls-scanner-run to fips-payload-scan for nightly-4.22 - #79624

Closed
redhat-chai-bot wants to merge 1 commit into
openshift:mainfrom
redhat-chai-bot:chai-bot/add-tls-scanner-to-fips-payload-scan
Closed

redhat-chai-bot wants to merge 1 commit into
openshift:mainfrom
redhat-chai-bot:chai-bot/add-tls-scanner-to-fips-payload-scan

Conversation

@redhat-chai-bot

@redhat-chai-bot redhat-chai-bot commented May 21, 2026

Copy link
Copy Markdown
Contributor

Summary

Integrate the TLS scanner into the existing fips-payload-scan periodic job so that TLS compliance scanning runs alongside the existing FIPS checks on the same cluster.

Changes

  • Add tls-scanner-tool base image from tls-scanner/tls-scanner:tls-scanner-tool (promoted by the openshift/tls-scanner CI)
  • Add tls-scanner-run step ref after the existing fips-check-node-scan and fips-check-art-fips steps

The existing fips-check steps are not modified. The TLS scanner runs as a third step on the same FIPS-enabled AWS cluster, deploying a privileged pod that enumerates all cluster pod TLS ports and validates their cipher suites and protocol versions.

Context

Requested in Slack thread.

/cc @openshift/tls-scanner-maintainers

Summary by CodeRabbit

This PR integrates TLS compliance scanning into the nightly 4.22 OpenShift CI pipeline by modifying the CI configuration for the openshift/release repository.

Changes to ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml:

  1. Added a new base image reference (tls-scanner-tool) that pulls the TLS scanner tool image from the openshift/tls-scanner repository. This image is automatically promoted by the tls-scanner CI pipeline and is used as a dependency for the test step.

  2. Extended the fips-payload-scan periodic job to include a new test step (tls-scanner-run) alongside the existing FIPS validation checks (fips-check-node-scan and fips-check-art-fips). This means TLS compliance validation will now execute as part of the yearly FIPS payload scan for the nightly-4.22 build.

Practical impact: The nightly 4.22 release pipeline will now automatically validate TLS cipher suites and protocol versions on cluster pods during its periodic FIPS compliance checks, providing better coverage of security compliance requirements without modifying the existing FIPS check steps.

Integrate the TLS scanner into the existing fips-payload-scan periodic
job so that TLS compliance scanning runs alongside the existing FIPS
checks (node-scan and art-fips) on the same cluster.

Changes:
- Add tls-scanner-tool base image from tls-scanner/tls-scanner
- Add tls-scanner-run step ref after the existing fips-check steps

The tls-scanner-run step deploys the TLS scanner as a privileged pod
that enumerates all cluster pod TLS ports and validates their cipher
suites and protocol versions.
@openshift-ci

openshift-ci Bot commented May 21, 2026

Copy link
Copy Markdown
Contributor

@redhat-chai-bot: GitHub didn't allow me to request PR reviews from the following users: openshift/tls-scanner-maintainers.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

Summary

Integrate the TLS scanner into the existing fips-payload-scan periodic job so that TLS compliance scanning runs alongside the existing FIPS checks on the same cluster.

Changes

  • Add tls-scanner-tool base image from tls-scanner/tls-scanner:tls-scanner-tool (promoted by the openshift/tls-scanner CI)
  • Add tls-scanner-run step ref after the existing fips-check-node-scan and fips-check-art-fips steps

The existing fips-check steps are not modified. The TLS scanner runs as a third step on the same FIPS-enabled AWS cluster, deploying a privileged pod that enumerates all cluster pod TLS ports and validates their cipher suites and protocol versions.

Context

Requested in Slack thread.

/cc @openshift/tls-scanner-maintainers

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@coderabbitai

coderabbitai Bot commented May 21, 2026

Copy link
Copy Markdown
Contributor

Walkthrough

This PR adds TLS scanner tooling to the OpenShift release CI configuration. A new tls-scanner-tool base image is defined under the ocp-kni/tls-scanner namespace, and the corresponding tls-scanner-run test reference is added to the fips-payload-scan job to integrate scanning into the test workflow.

Changes

TLS Scanner Tool Integration

Layer / File(s) Summary
TLS Scanner tool image and test integration
ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml
Introduces tls-scanner-tool base image mapping with name, namespace, and tag configuration, then adds tls-scanner-run as a test ref in the fips-payload-scan job to wire the scanner into the CI workflow.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~5 minutes

Possibly related PRs

  • openshift/release#79612: Adds e2e tests with IMAGE_TLS_SCANNER environment variable using the tls-scanner image that this PR wires into CI.
  • openshift/release#78981: Introduces tls-scanner-tool base image and wires tls-scanner-run into presubmit job flows alongside this PR's fips-payload-scan integration.
  • openshift/release#79416: Updates CI release configuration to add related TLS scanner base image mappings and extend scanner test references in job definitions.

Suggested labels

lgtm, approved

Suggested reviewers

  • hongkailiu
  • fao89
  • kaovilai
🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main change: adding tls-scanner-run test step to the fips-payload-scan configuration for the nightly-4.22 release.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR contains no Ginkgo test definitions. The tls-scanner-run is a bash script that runs a tool, not a Ginkgo test suite. No dynamic test names were introduced.
Test Structure And Quality ✅ Passed PR contains only CI configuration changes (YAML files), not Ginkgo test code. The custom check for Ginkgo test quality is not applicable to this configuration-only PR.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests are added in this PR. The PR only adds CI configuration (YAML) and a step reference that runs as a shell script. The custom check applies only when new Ginkgo tests are added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR only modifies CI configuration, not Ginkgo test code. It adds a reference to an existing bash-based tool (tls-scanner-run step), not new Ginkgo e2e tests.
Topology-Aware Scheduling Compatibility ✅ Passed PR adds a CI test reference with no scheduling constraints that would break on SNO, TNF, TNA, or HyperShift topologies. Single pod design is topology-compatible.
Ote Binary Stdout Contract ✅ Passed PR only modifies YAML configuration to add test/image references; contains no OTE binary code or stdout-emitting executable code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Custom check is not applicable. PR adds CI configuration references only, with no new Ginkgo e2e tests added. Check requires "new Ginkgo e2e tests" which are absent here.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 21, 2026
@openshift-ci

openshift-ci Bot commented May 21, 2026

Copy link
Copy Markdown
Contributor

Hi @redhat-chai-bot. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Tip

We noticed you've done this a few times! Consider joining the org to skip this step and gain /lgtm and other bot rights. We recommend asking approvers on your previous PRs to sponsor you.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci

openshift-ci Bot commented May 21, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: redhat-chai-bot
Once this PR has been reviewed and has the lgtm label, please assign petr-muller for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In
`@ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml`:
- Around line 90-93: You added a structural CI config entry (tls-scanner-tool
with name: tls-scanner, namespace: tls-scanner, tag: tls-scanner-tool) under
ci-operator/config; run the downstream artifact regeneration by executing make
update, review changes produced (e.g., generated files under the release/ or
ci-operator/jobs/ dirs), and commit those generated files alongside your config
change — if make update produces no changes, include the make output as evidence
in the PR to confirm it is a true no-op.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 2ec35479-5338-4fe6-979c-997fa23e05f6

📥 Commits

Reviewing files that changed from the base of the PR and between 96c4691 and 75f25ab.

📒 Files selected for processing (1)
  • ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml

Comment on lines +90 to +93
tls-scanner-tool:
name: tls-scanner
namespace: tls-scanner
tag: tls-scanner-tool

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Run and commit downstream CI artifact regeneration for this structural config change.

This PR adds a new base image and a new test ref, which are structural ci-operator/config changes. Please run make update and include any resulting generated artifact updates (or confirm it is a true no-op with evidence).

As per coding guidelines: “After modifying CI configuration files in ci-operator/config/, regenerate downstream artifacts by running make update”.

Also applies to: 2430-2430

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml`
around lines 90 - 93, You added a structural CI config entry (tls-scanner-tool
with name: tls-scanner, namespace: tls-scanner, tag: tls-scanner-tool) under
ci-operator/config; run the downstream artifact regeneration by executing make
update, review changes produced (e.g., generated files under the release/ or
ci-operator/jobs/ dirs), and commit those generated files alongside your config
change — if make update produces no changes, include the make output as evidence
in the PR to confirm it is a true no-op.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@redhat-chai-bot: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ipi-ovn-upgrade-runc N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ipi-ovn-dualstack-rhcos10-techpreview N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-disruptive-longrunning-techpreview N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ovn-ha-cert-rotation-shutdown-360d N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-dedicated-serial-techpreview-1of2 N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ipi-ovn-runc N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ipi-ovn-ipv6-runc-techpreview N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-local-gateway N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ovn-two-node-arbiter-upgrade N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-agent-single-node-ipv6-conformance N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-osd-ccs-gcp N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ipi-ovn-ipv4-disruptive-longrunning-techpreview-2of2 N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-csi N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-gcp-disruptive-longrunning-techpreview-1of2 N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-upgrade-from-stable-4.21-e2e-metal-ovn-two-node-arbiter-upgrade-workers N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ipi-ovn-ipv6 N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-gcp-ovn-etcd-scaling N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-upgrade-from-stable-4.21-e2e-metal-ipi-ovn-upgrade-runc N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ovn-two-node-arbiter-upgrade-day-2-workers N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ipi-ovn-techpreview N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-upgrade-from-stable-4.21-e2e-vsphere-upgrade N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-disruptive-longrunning-techpreview-1of2 N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-alibaba-ovn N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-rosa-hcp-ovn N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-4.22-e2e-vsphere-ovn-upi-vcf9 N/A periodic Ci-operator config changed

A total of 282 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@redhat-chai-bot

Copy link
Copy Markdown
Contributor Author

Closing in favor of a revised approach that integrates the TLS scanner directly into the fips-check-node-scan step to run in parallel, per feedback.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant